FS-24: Cleaned some code