diff --git a/Classes/BITArrowImageAnnotation.m b/Classes/BITArrowImageAnnotation.m
index 2d739b4fdc..bf6b3454cf 100644
--- a/Classes/BITArrowImageAnnotation.m
+++ b/Classes/BITArrowImageAnnotation.m
@@ -40,8 +40,7 @@
 
 @implementation BITArrowImageAnnotation
 
-- (id)initWithFrame:(CGRect)frame
-{
+- (id)initWithFrame:(CGRect)frame {
   self = [super initWithFrame:frame];
   if (self) {
     self.shapeLayer = [CAShapeLayer layer];
@@ -196,7 +195,7 @@
 
 }
 
--(void)layoutSubviews{
+- (void)layoutSubviews{
   [super layoutSubviews];
   
   [self buildShape];
diff --git a/Classes/BITBlurImageAnnotation.m b/Classes/BITBlurImageAnnotation.m
index 4760229d9f..0e1eda8dd8 100644
--- a/Classes/BITBlurImageAnnotation.m
+++ b/Classes/BITBlurImageAnnotation.m
@@ -39,8 +39,7 @@
 
 @implementation BITBlurImageAnnotation
 
-- (id)initWithFrame:(CGRect)frame
-{
+- (id)initWithFrame:(CGRect)frame {
     self = [super initWithFrame:frame];
     if (self) {
       self.clipsToBounds = YES;
@@ -57,7 +56,7 @@
     return self;
 }
 
--(void)setSourceImage:(UIImage *)sourceImage {
+- (void)setSourceImage:(UIImage *)sourceImage {
   CGSize size = CGSizeMake(sourceImage.size.width/30, sourceImage.size.height/30);
   
   UIGraphicsBeginImageContext(size);
@@ -95,7 +94,7 @@
   [CATransaction commit];
 }
 
--(BOOL)resizable {
+- (BOOL)resizable {
   return YES;
 }
 
diff --git a/Classes/BITFeedbackComposeViewController.m b/Classes/BITFeedbackComposeViewController.m
index d7dbb896ff..a5d61e2534 100644
--- a/Classes/BITFeedbackComposeViewController.m
+++ b/Classes/BITFeedbackComposeViewController.m
@@ -274,7 +274,7 @@
 	[super viewDidDisappear:animated];
 }
 
--(void)refreshAttachmentScrollview {
+- (void)refreshAttachmentScrollview {
   CGFloat scrollViewWidth = 0;
     
   if (self.imageAttachments.count){
@@ -411,7 +411,7 @@
   }
 }
 
--(void)addPhotoAction:(id)sender {
+- (void)addPhotoAction:(id)sender {
   if (_actionSheetVisible) return;
   
   // add photo.
diff --git a/Classes/BITFeedbackMessage.h b/Classes/BITFeedbackMessage.h
index f754e30c59..b8165f6793 100644
--- a/Classes/BITFeedbackMessage.h
+++ b/Classes/BITFeedbackMessage.h
@@ -90,7 +90,7 @@ typedef NS_ENUM(NSInteger, BITFeedbackMessageStatus) {
  
  @param object BITFeedbackMessageAttachment instance representing the attachment that should be added
  */
--(void)addAttachmentsObject:(BITFeedbackMessageAttachment *)object;
+- (void)addAttachmentsObject:(BITFeedbackMessageAttachment *)object;
 
 /**
  Return the attachments that can be viewed
diff --git a/Classes/BITFeedbackMessage.m b/Classes/BITFeedbackMessage.m
index 7f8d60dea1..342da85dab 100644
--- a/Classes/BITFeedbackMessage.m
+++ b/Classes/BITFeedbackMessage.m
@@ -85,7 +85,7 @@
 
 #pragma mark - Deletion
 
--(void)deleteContents {
+- (void)deleteContents {
   for (BITFeedbackMessageAttachment *attachment in self.attachments){
     [attachment deleteContents];
   }
@@ -103,7 +103,7 @@
   return returnArray;
 }
 
--(void)addAttachmentsObject:(BITFeedbackMessageAttachment *)object{
+- (void)addAttachmentsObject:(BITFeedbackMessageAttachment *)object{
   if (!self.attachments){
     self.attachments = [NSArray array];
   }
diff --git a/Classes/BITImageAnnotation.h b/Classes/BITImageAnnotation.h
index 8f1354a617..563ccc619c 100644
--- a/Classes/BITImageAnnotation.h
+++ b/Classes/BITImageAnnotation.h
@@ -36,7 +36,7 @@
 @property (nonatomic, weak) UIImage *sourceImage;
 @property (nonatomic) CGRect imageFrame;
 
--(BOOL)resizable;
+- (BOOL)resizable;
 
 - (void)setSelected:(BOOL)selected;
 - (BOOL)isSelected;
diff --git a/Classes/BITImageAnnotationViewController.m b/Classes/BITImageAnnotationViewController.m
index e9420da0c4..61077c160b 100644
--- a/Classes/BITImageAnnotationViewController.m
+++ b/Classes/BITImageAnnotationViewController.m
@@ -65,8 +65,7 @@ typedef NS_ENUM(NSInteger, BITImageAnnotationViewControllerInteractionMode) {
 
 #pragma mark - UIViewController
 
-- (void)viewDidLoad
-{
+- (void)viewDidLoad {
   [super viewDidLoad];
   
   self.view.backgroundColor = [UIColor groupTableViewBackgroundColor];
@@ -163,7 +162,7 @@ typedef NS_ENUM(NSInteger, BITImageAnnotationViewControllerInteractionMode) {
   self.imageView.frame = baseFrame;
 }
 
--(void)editingAction:(id)sender {
+- (void)editingAction:(id)sender {
   
 }
 
@@ -246,8 +245,6 @@ typedef NS_ENUM(NSInteger, BITImageAnnotationViewControllerInteractionMode) {
       
       self.panStart = [gestureRecognizer locationInView:self.imageView];
       
-      // [self.editingControls setSelectedSegmentIndex:UISegmentedControlNoSegment];
-      
     } else if (gestureRecognizer.state == UIGestureRecognizerStateChanged){
       CGPoint bla = [gestureRecognizer locationInView:self.imageView];
       self.currentAnnotation.frame = CGRectMake(self.panStart.x, self.panStart.y, bla.x - self.panStart.x, bla.y - self.panStart.y);
@@ -293,7 +290,7 @@ typedef NS_ENUM(NSInteger, BITImageAnnotationViewControllerInteractionMode) {
   }
 }
 
--(void)pinched:(UIPinchGestureRecognizer *)gestureRecognizer {
+- (void)pinched:(UIPinchGestureRecognizer *)gestureRecognizer {
   if (gestureRecognizer.state == UIGestureRecognizerStateBegan){
     // try to figure out which view we are talking about.
     BITImageAnnotation *candidate = nil;
@@ -346,7 +343,7 @@ typedef NS_ENUM(NSInteger, BITImageAnnotationViewControllerInteractionMode) {
   }
 }
 
--(void)tapped:(UIGestureRecognizer *)tapRecognizer {
+- (void)tapped:(UIGestureRecognizer *)tapRecognizer {
   // This toggles the nav and status bar. Since iOS7 and pre-iOS7 behave weirdly different,
   // this might look rather hacky, but hiding the navbar under iOS6 leads to some ugly
   // animation effect which is avoided by simply hiding the navbar setting it's alpha to 0. // moritzh
@@ -388,7 +385,7 @@ typedef NS_ENUM(NSInteger, BITImageAnnotationViewControllerInteractionMode) {
 
 #pragma mark - Helpers
 
--(UIView *)firstAnnotationThatIsNotBlur {
+- (UIView *)firstAnnotationThatIsNotBlur {
   for (BITImageAnnotation *annotation in self.imageView.subviews){
     if (![annotation isKindOfClass:[BITBlurImageAnnotation class]]){
       return annotation;
diff --git a/Classes/BITRectangleImageAnnotation.m b/Classes/BITRectangleImageAnnotation.m
index b08f5d302e..fd3ddc8c99 100644
--- a/Classes/BITRectangleImageAnnotation.m
+++ b/Classes/BITRectangleImageAnnotation.m
@@ -38,8 +38,7 @@
 
 @implementation BITRectangleImageAnnotation
 
-- (id)initWithFrame:(CGRect)frame
-{
+- (id)initWithFrame:(CGRect)frame {
     self = [super initWithFrame:frame];
     if (self) {
       self.shapeLayer = [CAShapeLayer layer];
@@ -79,7 +78,7 @@
   [CATransaction commit];
 }
 
--(BOOL)resizable {
+- (BOOL)resizable {
   return YES;
 }