Removed redundant declarations
cleanup and add sRGB support