JCinDE:
	- Cleaned up
	- Rename
